From f9b845ee301b3ba9e2d42169695e11e47bdf7494 Mon Sep 17 00:00:00 2001
From: Michael Albinus <michael.albinus@gmx.de>
Date: Wed, 11 Jun 2008 17:31:02 +0000
Subject: [PATCH] *** empty log message ***

---
 lisp/ChangeLog | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8cdc2bf41d9..efad56aa0fc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2008-06-11  Michael Albinus  <michael.albinus@gmx.de>
+
+	* net/tramp.el (tramp-make-temp-file): Backport from Tramp 2.1.
+
 2008-06-08  Michael Albinus  <michael.albinus@gmx.de>
 
 	* uniquify.el (uniquify-get-proposed-name): Handle remote files.
-- 
2.30.2